Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 27 Feb 2006 17:44:38 +0000 (18:44 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 27 Feb 2006 17:44:38 +0000 (18:44 +0100)

Trivial merge